bitkeeper revision 1.1389.5.48 (42809be2MsF_yD6mn_kF4ZL-8OJjkA)

Fix ASSERT() caused by cleanup to map_domain_mem_with_cache() changes.

diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index f62ab9c91d9c45e41c10cd73c42a9f55c5dc11da..d355b7e9af81114fc7290cafc15b487757a642cd 100644 (file)
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -1992,7 +1992,7 @@ int do_mmu_update(
                 printk("privileged guest dom%d requests pfn=%lx to map mfn=%lx for dom%d\n",
                        d->id, gpfn, mfn, FOREIGNDOM->id);
                 set_machinetophys(mfn, gpfn);
-                set_p2m_entry(FOREIGNDOM, gpfn, mfn, NULL, NULL);
+                set_p2m_entry(FOREIGNDOM, gpfn, mfn, &sh_mapcache, &mapcache);
                 okay = 1;
                 shadow_unlock(FOREIGNDOM);
                 break;